From 4696c862d6c8116e3acae20be86cf2cb206e8869 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Mon, 14 Feb 2005 12:17:32 +0000 Subject: [PATCH] bitkeeper revision 1.1203 (421096dcaYyLUeJDWzUpv9mpMfjHfQ) Merge cleanups. Signed-off-by: michael.fetterman@cl.cam.ac.uk --- xen/arch/x86/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ab0ef0960f..da2ed5cd50 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -286,7 +286,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs) ((regs->error_code & 3) == 3) && /* write-protection fault */ ptwr_do_page_fault(addr) ) { - if ( unlikely(shadow_mode(d)) ) + if ( unlikely(shadow_mode_enabled(d)) ) (void)shadow_fault(addr, regs->error_code); UNLOCK_BIGLOCK(d); return EXCRET_fault_fixed; @@ -294,7 +294,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs) UNLOCK_BIGLOCK(d); } - if ( unlikely(shadow_mode(d)) && + if ( unlikely(shadow_mode_enabled(d)) && (addr < PAGE_OFFSET) && shadow_fault(addr, regs->error_code) ) return EXCRET_fault_fixed; @@ -330,7 +330,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs) if ( likely((fixup = search_exception_table(regs->eip)) != 0) ) { perfc_incrc(copy_user_faults); - if ( !shadow_mode(d) ) + if ( !shadow_mode_enabled(d) ) DPRINTK("Page fault: %p -> %p\n", regs->eip, fixup); regs->eip = fixup; return 0; -- 2.30.2